Move FluentTheme code to new FluentUI_common module
#2139
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Saadnajmi
approved these changes
Mar 7, 2025
Saadnajmi
reviewed
Mar 7, 2025
Saadnajmi
reviewed
Mar 7, 2025
Sources/FluentUI_common/Core/Extensions/NSColor+Extensions.swift
Outdated
Show resolved
Hide resolved
Saadnajmi
reviewed
Mar 7, 2025
joannaquu
reviewed
Mar 8, 2025
Sources/FluentUI_common/Core/Extensions/UIColor+Extensions.swift
Outdated
Show resolved
Hide resolved
joannaquu
reviewed
Mar 8, 2025
thomasjross
reviewed
Mar 10, 2025
| convenience init(dynamicColor: DynamicColor) { | ||
| // Simple closure to return a nil NSColor if the passed-in Color is | ||
| // also nil, since the argument to `NSColor.init(_:)` is not optional. | ||
| let colorResolver = { $0 != nil ? NSColor($0!) : nil } |
There was a problem hiding this comment.
Since Optional includes support for .map() and .flatMap(), I wonder if you could remove this closure and instead do something like:
self.init(light: NSColor(dynamicColor.light),
dark: dynamicColor.dark.map { NSColor($0) }
thomasjross
reviewed
Mar 10, 2025
| self.init(dynamicColor) | ||
| } else { | ||
| #if os(macOS) |
There was a problem hiding this comment.
This could be a good excuse to rename Color+Extensions.swift to something more descriptive and then introduce something like DynamicColor+UIKit and DynamicColor+AppKit (or similar names)
thomasjross
reviewed
Mar 10, 2025
| @@ -40,15 +40,19 @@ extension Color { | |||
| /// | |||
| /// - Parameter dynamicColor: A dynmic color structure that describes the `Color` to be created. | |||
There was a problem hiding this comment.
Nitpick: Not related to this PR, but there's a typo here. dynmic -> dynamic
thomasjross
reviewed
Mar 10, 2025
| import SwiftUI | ||
| import UIKit |
There was a problem hiding this comment.
A little surprised this didn't generate a lint warning. There's the sorted_imports rule for this, which you could opt into.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Platforms Impacted
Description of changes
This PR lights up
FluentThemeand various other low-level Fluent utilities on macOS by moving them to a new cross-platform module,FluentUI_common. To walk through the changes, I've split the diff into four commits.320e374: Create FluentUI_common target
Package.swiftto specify a new build target,FluentUI_common.FluentUI_macosandFluentUI_iosto depend on this new target.e6b2370: Move common files to FluentUI_common directory
FluentTheme- and token-related files to the newFluentUI_commondirectory, with almost no changes.Color+Extensions.swift, which hooks into the new macOS-specificDynamicColorintegration found inNSColor+Extensions.swift.FluentUI.swift, which now also exportsFluentUI_commonin addition to the platform-specific module. This means users can continue to simplyimport FluentUIand get the code they expect.069ec24: Add import FluentUI_common to iOS files
import FluentUI_commonto every remaining file inFluentUI_ios, now that so much of the support structure of Fluent iOS has been moved to that library.1e07c89: Add import FluentUI_common to tests
Binary change
TBA, will be testing the built app to see impact.
Verification
Ran all automation on both iOS and macOS, and got the same level of success as before my change (there are some failing Notification tests that we should fix later).
Pull request checklist
This PR has considered:
Microsoft Reviewers: Open in CodeFlow